move Execute part to the execute function (closes #31)