Comments and refactoring.