Removed XCPretty and fixed up folding