Reformatted and fixed more javadoc fixes
Reformatted and fixed more javadoc fixes