Cleanup, update, refactor.