changed to new-style string formatting
more string formatting