refactoring/minor changes