Cleanup from queuetue:master

A big stylistic cleanup: Even Rubocop likes it.  Almost.