Please use `null` values instead of empty strings, per method documentation (at least for gateway, it's better). Also fix indentation.