Code cleanup based on ESLint scanning.