Minor corrections of style
Merge https://github.com/mbonaci/scala