Tidying a bit more.