simplify updateProperty, tighten up formatting