Improve readability of executor code