correct comments; go fmt