Adding customer analytics
Cleaning up