Tidy up Todo (not changelog)