Cleaner approach