Added some little changes to the code of AnalyticsFormatter