refactor queue initialisation
- get rid of all the 'undefined' setting, since that's the default
- extract commonality of state initialisation