[IMP] cleaned code