Cleanup and JavaDoc enhancements