Categories refactoring