-Fix: use size of the right string buffer
-Fix: fix coding style