a few more tidy-ups to use callAPISuccess rather than the long-form