Cosmetics + moved the selector-related stuff to bash-selector.sh