Clean up code. Refactor.