very small code cleaning fixes