Refactoring bash-completion

Refactoring bash_completion