squash! Refactoring previous commit.