more tidying - can now roxygenize