style corrections
Merge branch 'master' into feature