Deceased fix + Refactor