Refactor .bashrc and refactor bash completion