Refactoring is a lot of fun