Grep tweaks for easier-to-read code