[IMP] code clean up