moar general tidying