Added git grep line numbers

Also small tidy up