Improve javadocs
Simplify expression for number of trees