Coding standards and namespace fixes