I promise I'm done refactoring this time!