Javadoc related updates and code cleanup