[IMP] continue de code cleaning in this branch