cleanup and namespace rename