Fix scalastyle errors
Merge pull request #2 from mattf/giwa-master

Fix scalastyle errors