Work on report, reformat code somewhat