@Bex9 there is no perfect answer to what to do about cleaning fees. It really depends on what kind of guests you have and how long they stay.
In general, having a separate cleaning fee makes shorter stays more expensive, and longer stays cheaper (per night).
I noticed you have a minimum stay of 3 nights. This makes your cleaning fee less of an issue.
(The biggest effect of a cleaning fee is on stays of just 1 night.)
We prefer to have a cleaning fee because, although we allow one night stays, we don't want to encourage them. So our cleaning fee makes a one night stay pretty expensive. But if someone is willing to pay it, then they can. Plus it makes sure that our costs are always covered.