removed redundant comments and namespaces