[#49067409] Refactor code
[#49067409] Refactor code
Merge branch 'master' of https://github.com/congdm/Group-SE-1-K56CA-UET-VNU
[#49067409] Refactor code