NU-01(hj): - Refatored code: extracted magic strings