Refactoring was successful\! Sweet\!