More refactor.