Tidied up counties