Refactored property attributes and deleted unused properties