Fixed JSHint issues.
Merge pull request #2045 from pjackson28/master

Fixed JSHint issues