atomic: notation consistency
cleanup
Remove redundant macro