Fix some lint
Revert lint fix and fix it in jshintrc instead