Formatting of output strings fixed