Making the category code more concise