Refactored to one instance variable