Namespace and indentation changes.