Made new callback checker slightly more readable