More refac.