replace string + string by string.format() and remove some unused
breakpoints