add namify
clean up defonce