Converted instance variables to properties