Javadoc update and code cleaned