diff --git a/autonature/org.eclipse.statet.eutils.autonature/.settings/org.eclipse.jdt.ui.prefs b/autonature/org.eclipse.statet.eutils.autonature/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/autonature/org.eclipse.statet.eutils.autonature/.settings/org.eclipse.jdt.ui.prefs
+++ b/autonature/org.eclipse.statet.eutils.autonature/.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/autorun/org.eclipse.statet.eutils.autorun/.settings/org.eclipse.jdt.ui.prefs b/autorun/org.eclipse.statet.eutils.autorun/.settings/org.eclipse.jdt.ui.prefs
index ef9748b..190dcf6 100644
--- a/autorun/org.eclipse.statet.eutils.autorun/.settings/org.eclipse.jdt.ui.prefs
+++ b/autorun/org.eclipse.statet.eutils.autorun/.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