small code cleaning