simplify

Simplify the execution down to one function.