Merge pull request #1099 from hdevalence/master

Minor HLint-suggested changes