[Refactor] Code improvement for commit MakeBetter/Units/882121dc159e018b74f4b6170b620c780278d179