Version 2.0

Improve String format