Clean linter warnings