Refactor

Because I'm bored