Simplified grepping, changed newlines