used proper namespacing, docs improvement