master: knocked out a couple more reformats