Style fixes
Merge branch 'dev-yannick'