more tidying and methods