Pipeline simplification

Small output and pipeline change - mostly better use of awk