[MINOR] improvments