Minor clean up
Replace Java collections by Scala collections
Merge pull request #912 from pdalpra/master

Replace Java collections + clean up