Refactored API Calls
Refactoring + Removed Points from market