Namespace and formatting changes