name change
Couple quick bug fixes with refactoring and name change
The most beautiful refactoring in the world :smirk_cat: