Convert some properties to auto-properties
Merge pull request #3295 from Benglin/MinorChanges

Convert some properties to auto-properties