Yes, I guess that's the PEP8 recommendation. But if there are no objections I'd prefer to leave them as they are for now, it seems more readable for things like `Gyr` and `Mpc_km`.