tidying a bit