Some more linting thanks to scrutinizer-ci
More linting!