Fixed warnings from linter