Refactor.
Refactor and cleanup.