Moved format string to return statements