Improve window movement; delete commented lines.