Fixed javadoc warnings
Formatted