Fix all CS issues

Well. I think this is the PR everybody always dreamed of.

Bye Scrutinizer issues. Hope we won't see anymore. :wave: