Added Javadoc plugin
Formatting changes