style adjustments
Merge branch 'master' into andrea