Cleanup.
Extract execution state into separate module.