Minor refactors

Minor style refactors
Require underscore always explicitely
Remove unneeded jshint maxcomplexity: false