Fixing JSHint violations
Merge branch 'Cleanup'