Done with first round of commenting in PaintWindow