fixed javadoc
fixed javadoc
Simplified type structure.