changes to style
Merge branch 'carolyn'