Made most of the JavaDoc