[#40680193] Refactoring
[#40680193] Refactoring
[#40680193] Refactoring
[#40680193] Refactoring