Refactor.
Cleanup.