changed namespace, more cleanup