more gatewayd reformatting