Tidying a bit.