#20 simplified the code inside runtime executor