A bit of tidying in response to R CMD check