add comments and gofmt