Used some different enumerable methods, so I wasn't using grep twice.