[CLEAN] cleaning code