Refactor is a word!