Fixed up camel calls
Adjusting code to be fully aligned