Update JavaDoc Comments

Some misc code cleanup and JavaDoc comments.