Styles tweaks
Merge pull request #483 from wmathurin/unstable23

Styles tweaks