More tidying.