[UPDATE] cleaning code