There has just been some discussion around it here:
I suppose it could indeed be improved.
I will mark this topic as pr-welcome as the activity is one of our open-sourced ones and we are happy for one of our community members to have a look and improve it