More refactor tweaks