Add braces to if statement so jshint stops complaining
Added several items to jshint so it would stop complaining
Removed unused e param