Scala-ifying

- Lots of changes to try and make stuff more Scala-like...