Market.py Code Cleanup