Reduce when/callbacks size