more tidying with documentation