A little reworking
A little reworking