After we introduced the linter we haven't really touched the old code. This commit now fixes all linting issue that exist right now.