Most style-level changes for #82
Merge branch 'dev' into ms