Fix Scala Style

Any comments are welcome