Commenting and refactoring.