Code tidying.