Fix CSR DN, tidy up some lines