minor refactor in PropertyClient class