Comments, refactoring.