* Reformatted
* Fixed Javadoc issues