Some refactoring; StringBuilder has been changed to s"..."