removed unused properties and PEP8 correction