some more bashrc refactoring