Refactoring like a boss
Like a booooos