minor comments and cleanup
Appears to receive mail, does not update DB