Finish polishing the planets class