More refactory.