Tidied up execution.