By moving all the code that depends on the new API
we avoid unnecessary indentation in the code.
Signed-off-by: NMordechai Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: NLuca Coelho <luciano.coelho@intel.com>