Huge refactoring in bash_profile