Fix string
Enhance output