Minor changes, format() string