Resolve Javadoc Warnings/Errors and Formatting Update