removed creation of helper instances of consumesCollector and enforeced usage of '&&' everywhere