Fix javadoc errors
Fix javadoc errors and add enhanced for