Tidied up headers and by-lines