Make analytics module PSR compliant