huzzah for refactoring