Move and tidy things around in bashrc