Tidying header
Merge