[IMP] - code cleaning