Slightly rewritten executor code