Cleanup indentation
Squashed some repeat code into a function

Moved the work which actually assigns the property to it's own private
method.