Changed some Rectangles to double rectangles, and fixed indentation