Comments & refactoring