suggested cleanups

looking pretty good.  I just reviewed mttf-queue