Removed var redeclarations by switching export forms

Closes #88