Refactoring/commenting