Significant cleanup of .bashrc