Scala Doc updates and clean up