Removed use of _ for properties, instead accessing using self.