Moved some string formatting to the decorator.