Tidy up commit message and change restore function