+ futher refactor tweaks