Tidying up that darned header