Refactoring/comments