Changes followig coderunner review (QueueFactory + more)