Cleaner implementations