[CHORE] Code cleanup