Feature/analytics

Move the comment inside the if block.