port to Go 1.1.1
go fmt