Changed the variables.

Moved and changed variables to better fit the story.