Minor changes per jshint suggestions