Improve overall api usage

[pietzschke]

Checklist for your PR

• [ ] please start with a draft PR and mark it as ready for review when you are confident that your implementation works as expected.
• [ ] add a changelog entry in CHANGELOG.md with a link to this PR.
• [ ] make sure that all tests pass and add new test functions if your code is not covered by existing tests. Please use mock tests when network requests are required.
• [ ] let someone review & approve your code, make changes where necessary.

Hints

• name your branches accordingly: use the prefixes bugfix/, feature/, or release/ and then a short title for your PR in kebab-case (lowercase words separated with dashes), e.g. feature/my-awesome-feature.
• Please make sure that pre-commit hooks are enabled on your system to avoid common mistakes before you make a commit.
• feel free to delete this template and replace it with your own description of the PR.