Clean and refactor.