Adjusted string formatting to be a bit more compact