changed namespace
removed redundant code