Move jshintrc into package.json

And some code cleanup