Completed javadoc