GATEWAY-3351: updates for formatting per CR comments.