[fix] code cleanup