[PATCH 0/3] more re-formatting to facilitate STIG process