Director direction queueing code tidied up