remove CGI dependency
cleaned up namespace methods