more perly refractoring. greping can now be done on one line