Obvious refactor is obvious