refactory bundle metrics points calculation