cleanup and better refresh for comments