Passes .fix! test
Refactoring