Refactor + remove zombies