Refactor #32 — Deca