Changed a couple of variable names.
Shortened a bunch of variable names.