format cleanup and proofing