OCD refactor.