Types simplifications, scaladoc