fix possible awk trouble, re-order comments to make more sense
remove useless if