Code commenting and refactoring.