Refactored .bashrc