tidied up headers