Before cleanup code
Comments and refactoring