some initialisms consistentcy cleanups; gofmt; goimports;