Reformatting windows section a bit