Tidying a little bit