cleaned up eslint errors/warnings