Cleaned up the Universe and SolarSystem code