Various tidying.