[refac][fix] minor changes