Fixed Typo and 80 Lines Character

Rebased third party author commits to single commit.
Fixed typo and 80 lines character.