go fmt & cleanups