Code cleanup, report adjustments.