Cleanup refactor.