Checkpoint: some refactorings and order category by priority