Comments ajusted as JavaDoc generator wished