Minor changes in comments and format.
Merge branch 'master' of https://github.com/cedadev/esg-orp