We call this refactoring