Fix all CS issues

Well. I think this is the PR everybody always dreamed of.

Bye Scrutinizer issues. Hope we won't see you anymore. :wave: 
hmmm no sorry, if the dispatcher is mandatory don't do this. I know, optional parameters must be at the end of the signature but I think we have to deal with these issues.