super cool refactoring