Fixing ESLint errors
Rule: No conditional expression