tidy up a little, partly addressing #214