Ref #1 - Removed JOYNAME

- I don't care about the joy name.
- I also cleaned up many of the lines to fit my own style. I'm moving away from
	Aloshi's code style to match my own preferences.