More cleanup and new java doc