Tidied up machine execution