Fixed Naming, indentations, and comments.

This time it will hopefully work, and not screw up like last time.

But seriously, I have absolutely NO idea what happened before.  The code was perfectly fine before I hit commit, and then afterwards, not so much.

I'll just blame it on Zach.