Refactor like mad.