[REFACTOR] Split assignment d and e