Merge "Minor code style changes and namespace fix"