Make execute function simpler