Cleanup and improved .bashrc