Tidy patch header details and line numbers