updated todo with suggestions and go fmt