Uses Citrus' own Routing system
Variable renaming errors
code convention cleaning