More cleanup of formatting.