Clean up and add more dynamic grep commands where there were awk ones