super mega refactoring