Refactoring

See my previous comment about StringBuilder()