Cleaning up refactor.