Clay
refactor work code