refactoring and cleaning
fix solarSystem