Refactored Clash