Cosmetics
Improve string formatting