Fix to add missing semicolons
Fix duplicated variable definitions
Fix positions of line breaks
Fix problematic comparisons
Merge branch 'lint-a-bit'

Related to: gh-101