Tidying a little bit.