More refactor moves