Fixed format and removed number buckets