full code cleaning :-)