Simplify edition finding code