An electrochemical cell includes a cell housing and an electrode assembly disposed in the cell housing. The electrode assembly includes an electrode pair that is arranged to form a winding having a polygonal spiral wound shape in which a radius of the corner portions of each turn of the winding is constant, regardless of the number of turns. In addition, a length of the linear portions of one turn of the winding is different than a length of the linear portions of another turn of the winding. Since each turn of the winding includes the corner portions having a desired radius, the volumetric efficiency of the electrode assembly including the winding within a cell housing is improved relative to some cells that use conventional windings. An apparatus and method of forming a polygonal spiral wound winding are disclosed.