Start refactoring
Restore jshint checking