More refactoring

Camel is still not broken.