Updated Scala version.
Minor clean-up.