little code cleaning