Move callback to named function to make things more clear to new developers