Refactors for atoms dict