t#31896:refact elm