Refactoring is fuuuun