refactor - prep-work for re-connect logic
refactor - prep-work for re-connect logic

QueueClassic/queue_classic,mashroomxl/queue_classic,clemensg/queue_classic,YodelTalk/queue_classic,bdon/queue_classic_java,QueueClassic/queue_classic