Semantic consistency and format fix.
Also replaced push with emplace when enqueueing.

squash