Cleaning up Fugly code

Shit was gnarly brah