Changes to meet max of 2 instance variables per class