A minor refactoring for following patches.
This enables the reuse of the checks functions.

type=cleanup
Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>