Refactor

Oops, I must have not deleted the `refactor` branch on my Mac.

Don't mind me.