Simplify summary form code

Also fix calculation deadend.