Fixing eslint errors in codebase