Formatting and comments
Merge branch 'master' of https://github.com/mplewis/olivaw