issue #24 code optimization and code formatting for AnalyticsDataHelper