IDE-1630 Using the StringBuffer for message
IDE-1630 simplfy