MNT : simplify version code/logic