Comment cleanup logic