Fix jshint complaints
Use type labels in facets