Refactor.
Refactor.
Refactor.
Refactor.
Refactor.
Merge pull request #30 from pazur/queues2

Refactors.