Changes for re-work back to main mono repository

Cleaned up all my changes to match the existing file format and follow
the mono coding guidelines.  Also renamed a variable to indicate size
meant character count and not byte size.