Readability Fix

I'm slowly standardizing the naming in the code.  In addition, I'm
laying the groundwork for hardcore characters and a simple progress
system.