For me in NJ the "normal wear & tear " and "broom swept" are many shades of gray ! Therefore I include in the return of security item of the lease - that a end of lease admin fee of $100 will be deducted from the security period. This is in addition to and other damage / repair costs etc.
When and if they ask I NEVER use the word cleaning fee - this signals that since they are already getting $100 deducted they won't bother to clean.
I mention re-keying as was done for you when you moved in - admin time for processing the security deposit anything but cleaning.
As they signed the lease with this condition ( as well as each item in lease initialed ) it is cut and dry when taken out rather then dealing with what is in the gray areas of security return. --68.197.xx.xx