Tidied header code.