Table headings, cleanup, refactor.