[#40680193] Refactoring