light refact
correcting debug informations