Cleanup, refactor.