entitlement: integrate code review comments

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>