small code cleaning updates