Did some tidying up.