Fixed the namespace and the comments