Fix DRY in Maker_ID code -2