[refactor] [minor] Code cleanup