modifying grep and awk for a cleaner scripting

[gcarmin]

Changing some grep and awk.

[glommer]

Please squash these commits together so we can have clear history.