Refactor #16 — Deca