tightening grep expressions