[Minor] code cleanup
[Minor] code cleanup