A small amount of simplification

I've never liked the pattern of setting a flag and having an if{} block every pass through a loop just to select between two string constants. Maybe you'll like this version more.