Improve clarity of atom logic