go fmt + some minor cleanup