changing code to remove warnings / cleaning comments
creating analytics for error and unexpected situations