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: 
I don't agree, don't change the signature. I know it's an issue on scrutinizer but we have to deal with it.