change a few holdouts to modern string forrmatting