Refactoring: minor changes