Added check for comments +strip