Javadoc and code cleaning