Improved formatting of type, program, agency.