some basic tidying