Javadoc update and code cleaning