More refactorings HELLS YEAH.