Fixing things exposed by jshint
Fixing tweaks exposed by jshint