refactor everything to Bash+