Cleaned up dump.py