Refactored to meet the limit of 2 instance variables per class