Tidied up headers for code