Cleanup.
Refactor.