Tidying up customFields