reverted lambdas back to anon. inner classes (3x)