small reworking of the flavor api