Cleaning up fugly code

Shit was gnarly brah