some jshint driven cleanup