Update project settings (Eclipse 2021-06)
diff --git a/core/org.eclipse.statet.rj.client/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.client/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.client/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.client/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.data-tests/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.data-tests/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.data-tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.data-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.data/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.data/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.data/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.data/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.server-tests/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.server-tests/.settings/org.eclipse.jdt.ui.prefs
index e531dc6..190dcf6 100644
--- a/core/org.eclipse.statet.rj.server-tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.server-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,4 @@
+cleanup.add_all=false
 cleanup.add_default_serial_version_id=true
 cleanup.add_generated_serial_version_id=false
 cleanup.add_missing_annotations=true
@@ -12,21 +13,35 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
+cleanup.break_loop=true
 cleanup.collection_cloning=false
+cleanup.comparing_on_criteria=false
+cleanup.comparison_statement=true
+cleanup.controlflow_merge=false
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
+cleanup.double_negation=false
+cleanup.else_if=false
 cleanup.embedded_if=false
+cleanup.evaluate_nullable=false
+cleanup.extract_increment=false
 cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.hash=false
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
+cleanup.invert_equals=false
+cleanup.join=false
 cleanup.lazy_logical_operator=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=true
@@ -35,20 +50,33 @@
 cleanup.make_variable_declarations_final=true
 cleanup.map_cloning=false
 cleanup.merge_conditional_blocks=false
+cleanup.multi_catch=true
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=false
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
+cleanup.overridden_assignment=true
+cleanup.plain_replacement=true
 cleanup.precompile_regex=true
+cleanup.primitive_comparison=true
+cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
+cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
+cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -66,9 +94,27 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
+cleanup.single_used_field=false
 cleanup.sort_members=false
 cleanup.sort_members_all=false
+cleanup.standard_comparison=false
+cleanup.static_inner_class=false
+cleanup.strictly_equal_or_different=false
+cleanup.stringbuilder=false
+cleanup.substring=true
+cleanup.switch=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
+cleanup.try_with_resource=true
+cleanup.unlooped_while=false
+cleanup.unreachable_block=false
 cleanup.use_anonymous_class_creation=false
 cleanup.use_autoboxing=false
 cleanup.use_blocks=true
@@ -76,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -84,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -100,6 +148,7 @@
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=99
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\#\n \# Copyright (c) ${year} ${name\:git_config(user.name)} and others.\n \# \n \# This program and the accompanying materials are made available under the\n \# terms of the Eclipse Public License 2.0 which is available at\n \# https\://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0\n \# which is available at https\://www.apache.org/licenses/LICENSE-2.0.\n \# \n \# SPDX-License-Identifier\: EPL-2.0 OR Apache-2.0\n \# \n \# Contributors\:\n \#     ${name\:git_config(user.name)} &lt;${email\:git_config(user.email)}&gt; - initial API and implementation\n \#\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=*/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * \n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="recordbody_context" deleted\="false" description\="Code in new record type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.recordbody" name\="recordbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_all=false
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -114,21 +163,35 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
-sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
+sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
+sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.double_negation=false
+sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
+sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
+sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=true
@@ -137,6 +200,7 @@
 sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=false
 sp_cleanup.no_string_creation=false
@@ -144,14 +208,26 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
+sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=true
+sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
+sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
+sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -169,9 +245,27 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
+sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuilder=false
+sp_cleanup.substring=false
+sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
+sp_cleanup.ternary_operator=false
+sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -179,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -187,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.server.remotetools/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.server.remotetools/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.server.remotetools/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.server.remotetools/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.server.rpkg/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.server.rpkg/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.server.rpkg/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.server/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.server/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.server/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.server/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/srv/CliUtil.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/srv/CliUtil.java
index 8423609..5fe7d8d 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/srv/CliUtil.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/srv/CliUtil.java
@@ -83,8 +83,8 @@
 	}
 	
 	protected void checkGlobalOptions() {
-		if (Boolean.parseBoolean(System.getProperty("org.eclipse.statet.rj.verbose"))
-				|| Boolean.parseBoolean(System.getProperty("org.eclipse.statet.rj.debug")) ) {
+		if (Boolean.getBoolean("org.eclipse.statet.rj.verbose")
+				|| Boolean.getBoolean("org.eclipse.statet.rj.debug") ) {
 			this.options.put("verbose", "true");
 		}
 		if (this.options.containsKey("log")) {
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
index d5563e5..17f1e46 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
@@ -142,7 +142,7 @@
 	}
 	
 	public static void prettyPrint(final Map map, final StringBuilder sb) {
-		final String sep= System.getProperty("line.separator")+"\t";
+		final String sep= System.lineSeparator() + "\t";
 		final Set<Entry<?, ?>> entrySet= map.entrySet();
 		for (final Entry<?, ?> entry : entrySet) {
 			sb.append(sep);
@@ -156,7 +156,7 @@
 	}
 	
 	public static void prettyPrint(final Collection<?> list, final StringBuilder sb) {
-		final String sep= System.getProperty("line.separator")+"\t";
+		final String sep= System.lineSeparator() + "\t";
 		for (final Object value : list) {
 			sb.append(sep);
 			if (value != null) {
diff --git a/core/org.eclipse.statet.rj.services.core-tests/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.services.core-tests/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.services.core-tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.services.core-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.services.core/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.statet.rj.services.core/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/core/org.eclipse.statet.rj.services.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.statet.rj.services.core/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/core/org.eclipse.statet.rj.services.core/src/org/eclipse/statet/rj/services/util/dataaccess/AbstractRDataAdapter.java b/core/org.eclipse.statet.rj.services.core/src/org/eclipse/statet/rj/services/util/dataaccess/AbstractRDataAdapter.java
index 225c515..837e032 100644
--- a/core/org.eclipse.statet.rj.services.core/src/org/eclipse/statet/rj/services/util/dataaccess/AbstractRDataAdapter.java
+++ b/core/org.eclipse.statet.rj.services.core/src/org/eclipse/statet/rj/services/util/dataaccess/AbstractRDataAdapter.java
@@ -73,7 +73,7 @@
 			}));
 			result= fcall.evalData(m);
 		}
-		if (RDataUtils.checkSingleLogiValue(result) == false) {
+		if (!RDataUtils.checkSingleLogiValue(result)) {
 			throw new UnexpectedRDataException("It seems something changed.");
 		}
 	}
diff --git a/eclient/org.eclipse.statet.rj.eclient.core/.settings/org.eclipse.jdt.ui.prefs b/eclient/org.eclipse.statet.rj.eclient.core/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/eclient/org.eclipse.statet.rj.eclient.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/eclient/org.eclipse.statet.rj.eclient.core/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/.settings/org.eclipse.jdt.ui.prefs b/eclient/org.eclipse.statet.rj.eclient.graphics/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/.settings/org.eclipse.jdt.ui.prefs
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/examples/org.eclipse.statet.rj.example.demo/.settings/org.eclipse.jdt.ui.prefs b/examples/org.eclipse.statet.rj.example.demo/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/examples/org.eclipse.statet.rj.example.demo/.settings/org.eclipse.jdt.ui.prefs
+++ b/examples/org.eclipse.statet.rj.example.demo/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo1/.settings/org.eclipse.jdt.ui.prefs b/examples/org.eclipse.statet.rj.example.rcpdemo1/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo1/.settings/org.eclipse.jdt.ui.prefs
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo1/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo2/.settings/org.eclipse.jdt.ui.prefs b/examples/org.eclipse.statet.rj.example.rcpdemo2/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo2/.settings/org.eclipse.jdt.ui.prefs
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo2/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/servi/org.eclipse.statet.rj.servi-tests/.settings/org.eclipse.jdt.ui.prefs b/servi/org.eclipse.statet.rj.servi-tests/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/servi/org.eclipse.statet.rj.servi-tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/servi/org.eclipse.statet.rj.servi-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/servi/org.eclipse.statet.rj.servi.webapp/.settings/org.eclipse.jdt.ui.prefs b/servi/org.eclipse.statet.rj.servi.webapp/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/servi/org.eclipse.statet.rj.servi.webapp/.settings/org.eclipse.jdt.ui.prefs
+++ b/servi/org.eclipse.statet.rj.servi.webapp/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/servi/org.eclipse.statet.rj.servi/.settings/org.eclipse.jdt.ui.prefs b/servi/org.eclipse.statet.rj.servi/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/servi/org.eclipse.statet.rj.servi/.settings/org.eclipse.jdt.ui.prefs
+++ b/servi/org.eclipse.statet.rj.servi/.settings/org.eclipse.jdt.ui.prefs
@@ -13,9 +13,11 @@
 cleanup.always_use_parentheses_in_expressions=true
 cleanup.always_use_this_for_non_static_field_access=true
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
 cleanup.arrays_fill=true
 cleanup.bitwise_conditional_expression=false
 cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
 cleanup.break_loop=true
 cleanup.collection_cloning=false
 cleanup.comparing_on_criteria=false
@@ -24,7 +26,7 @@
 cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
-cleanup.convert_to_switch_expressions=false
+cleanup.convert_to_switch_expressions=true
 cleanup.correct_indentation=false
 cleanup.double_negation=false
 cleanup.else_if=false
@@ -37,6 +39,7 @@
 cleanup.if_condition=true
 cleanup.insert_inferred_type_arguments=false
 cleanup.instanceof=true
+cleanup.instanceof_keyword=true
 cleanup.invert_equals=false
 cleanup.join=false
 cleanup.lazy_logical_operator=false
@@ -53,14 +56,18 @@
 cleanup.no_string_creation=false
 cleanup.no_super=false
 cleanup.number_suffix=true
-cleanup.objects_equals=false
+cleanup.objects_equals=true
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=true
 cleanup.organize_imports=true
-cleanup.overridden_assignment=false
+cleanup.overridden_assignment=true
 cleanup.plain_replacement=true
 cleanup.precompile_regex=true
 cleanup.primitive_comparison=true
 cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
 cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=false
 cleanup.pull_up_assignment=false
 cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -69,6 +76,7 @@
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.reduce_indentation=false
+cleanup.redundant_comparator=false
 cleanup.redundant_falling_through_block_end=false
 cleanup.remove_private_constructors=true
 cleanup.remove_redundant_modifiers=false
@@ -86,6 +94,7 @@
 cleanup.remove_unused_private_members=false
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
 cleanup.simplify_lambda_expression_and_method_ref=false
 cleanup.single_used_field=false
 cleanup.sort_members=false
@@ -96,7 +105,13 @@
 cleanup.stringbuilder=false
 cleanup.substring=true
 cleanup.switch=false
-cleanup.ternary_operator=false
+cleanup.system_property=true
+cleanup.system_property_boolean=true
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=true
+cleanup.system_property_line_separator=true
+cleanup.system_property_path_separator=true
+cleanup.ternary_operator=true
 cleanup.try_with_resource=true
 cleanup.unlooped_while=false
 cleanup.unreachable_block=false
@@ -107,6 +122,7 @@
 cleanup.use_directly_map_method=false
 cleanup.use_lambda=false
 cleanup.use_parentheses_in_expressions=false
+cleanup.use_string_is_blank=false
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 cleanup.use_this_for_non_static_method_access=true
@@ -115,6 +131,7 @@
 cleanup.use_var=false
 cleanup.useless_continue=false
 cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=false
 cleanup_profile=_StatET
 cleanup_settings_version=2
 eclipse.preferences.version=1
@@ -146,9 +163,11 @@
 sp_cleanup.always_use_parentheses_in_expressions=true
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=true
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
 sp_cleanup.comparing_on_criteria=false
@@ -170,6 +189,7 @@
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
 sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
@@ -188,13 +208,17 @@
 sp_cleanup.number_suffix=true
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
 sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
 sp_cleanup.primitive_comparison=true
 sp_cleanup.primitive_parsing=true
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=true
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -203,6 +227,7 @@
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -220,6 +245,7 @@
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=false
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
 sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
@@ -230,6 +256,12 @@
 sp_cleanup.stringbuilder=false
 sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
 sp_cleanup.unlooped_while=false
@@ -241,6 +273,7 @@
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
@@ -249,3 +282,4 @@
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false