more tidying, types, etc.