Queue

Improve readability and pythonicity.