Tidying a little