refactoring/commenting