Fix and clarify some comments
Do not use `is` when comparing to strings
Whitespace