Replace usage of StringBuffer to StringBuilder

Squash commits for #824