More cosmetic changes.
Merge branch 'master' of github.com:amcglathery/turnt-cyril