Cleaner handling.
Even cleaner handling.