refactor common atoms