Use cleaner design