Simplify reporting and fix missing space