Solve ESLint issues