Cleanup + ScalaDoc