Refactoring is nice