Moar refactorings