Code tidying up.