Enhanced some Javadoc