format refinements
Merge branch 'master' of github.com:mfvalin/wrapper-code