Clean up of property set code

Addresses Issue #1