Javadoc, a little bit of code cleaning.