More refuctoring.