Fixed linter violations