Cleaner Sets based on a code review