Refactor instance vars and properties
Merge branch 'refactor-instance-vars'