Refactor #2 — Deca