Code cleaning + ran gofmt