Removed some spaghetti code of a property.