Improved number formatting
Reduced number of imports