Refactored some instance variables.