Work on fixing JSHint errors