The Refactor

Moved instance variables to their own spot. Tested and approved
functions.