Updated javadoc
Fixed javaDoc error and improved consistency