cleanup, some tidying