Code style fixes
Merge branch '3.0' of https://github.com/henrikerola/scaladin into 3.0