Add module exports to Model modules
Move unsubscribe content to template
Fix shadowed variable warning