Cosmetic change
Consolidate the System checks before the execution