Remove use of StringBuffer