Cleanup and JavaDoc for the common utilities