formatting update per gofmt
update imports order per goimports