Tidy up for #81