Cleanup in JavaFormat class