Tidied up categorisation into separate series/categories/other types