Add Javadoc on some cleaning