Minor improvements and reorganization of .bashrc