minor cleanup of Atomic