Replaced many instance variables with a dict()