Scala cleanup

Review by @headinthebox and @samuelgruetter.