More refactoring and eye candy