Cleaning
Fix #1 - analytics
Fix #2 - comments
Better