Cleaned up code in atommap module.
Fixed a type error, set `termini` to list of none when it's none.