Add fam tiers info
Clean up the code