Freeform cart v4

Reformatting changes.