More refact