Tuned and started tidying.
More tidying up.
More idiomatic scala?
tweaking