Remove exported variables

&& squishes a couple other issues too.
I'm cool with leaving them in until we have a solid reason to remove em. ( ie. once this project has moved beyond MVP )

Merge this shiii if you're cool with everything else