Cleanup while I port...

Whistle while I work...
The code is actually getting better organized already, Scala makes you
think about the best way to do things.