indexed accesses and packing up repetetive free() calls. Also
some cosmetics. Should not add functional changes but should make
it a bit more readable.