Fixed regular expression

Don't need multiple calls to grep anymore