#504 tidy some references