Light refactoring.  Focus on planet/sim methods.

The code was getting messy and unclear.  Tried to do a better job of
naming/implementing methods to make their purpose more apparent.