#312 - Replaced instance variable with property for better scoping