More refactoring
Rename 'String' to 'Message'
Fix bug when generating varint