Use string format function in all cases

- String format used in all places;
- Small comment corrections.