Define a Cleaner 'type' for cleaners

Aimed at helping a potential move to Future-based cleaning