Adding a some logic to avoid empty comments