Tidy up for #155