Comment Beautification and Typo Fix