make subs our-scoped and comment out exporting