modified format string and removed unnecessary else around return, as per @creack