Changed options name to CamelCase

- as requested
Few small fixes

- fixed logging to {} format
- code reformat