Cleaned up number formatter