Utilize entering state method
Simplify Property code
Refactor fully property