Refactor propery update

/to @seanbrookes