fix some linter warnings on the way