misc
Improved use of scalastyle