Refactorings and comments