DRY
Improve number formatting
Simplify the analyzer