When2run Packages

with when2run to reduce cyclomatic complexity by chaning execute