JSHint fixes
JSLint pass