Tidied up the Category.