[API] Tiny refactor