refactor tweaks