Tweak refactor.