Beautifying Orbit.scala / Fixes in Simple.scala