A Cleaner Implementation