More refctor