Changes to make scalastyle happy.

For proper build we need to pass scalastyle verification enforcing code
rules (length of line, using spaces after operators,...).