comments done and some clean