run gofmt, address some review comments