CAMEL-8006 Polished the code with suggestion of Claus