FIX Linter errors