removed units from formatting function and moved to cache-data #504