Cleaner implementation