Safer atexit commits
Minor format string change
Add drop function
PEP8