Tidying up.
More tidying.