api: address review comments