Edited parser.py and db.py to provide cleaner data sets