refactor/tweak