Moar refactorings, y'all