Changed object properties to use inbuilt setter/getter functionality