remove commented out code; improve property class comment