Cleanup for comments