huzzah, refactoring