Updated javaDoc comments