Refactor categories