Simplify definition of Category
More simplification