Tidy up
Merge