Refactored something in Clash