* [ATOM_EXT,SC] Minor cleanup/