tweak refactor