syntax and namespace fix