MOAR REFACTORING