[IMP] : small code improvments