Improve grep format