[Minor] code cleanup