More refactors.