Trimmed the fat in the astronomy model
Merge pull request #25 from tomstrassner/feat/astronomy/cleanup

Trimmed the fat in the astronomy model