did some cleaning, commenting