forgot to call cleanup() and fixed eslint messages