ex-2.86: Refactor - Simplify