#20309193775942 : Refactor to improve the code quality