CAMEL-7457 polish the code with the suggestion of Clause