Fixup formatting
Remove duplicate check
Calm jshint. Calm.