Fix typo, inline comments and formatting strings