Mass refactor.