[api] some beautifying