ScalaDoc & cleanup