report output & cosmetic code changes