CLEANUP: Code linting