Various stylistic cleanups to address questions from David's code review.
Various stylistic cleanups to address questions from David's code review.

SalesforceFoundation/mrbelvedereci,SalesforceFoundation/mrbelvedereci,SalesforceFoundation/mrbelvedereci,SalesforceFoundation/mrbelvedereci