[Change] code cleanup