Fix typo
Add completed class conditionally
Wrap comments to 80