Added scaladoc comments