Small cleanup of category