tiny PropertyGenerator readability cs fixes
Merge branch 'propertygenerator-refactor'

* propertygenerator-refactor:
  tiny PropertyGenerator readability cs fixes