JavaDoc updates and some formatting cleanup