[#76957592] Refactored code