Tidy up the diff and add some info for construct