Removed get/set methods, now using properties