Cleaning refactor.