style changes
Merge branch 'chris'