refactoring + incl. camel