cleaner DRY check