Trimmed the fat in the astronomy model