The merging is complete
Tidying and commenting