Rename command-line options
Move print statements out of db.py to script
Minor clean-ups and add separators for readability