cleanup; use fat-arrow function binding