Refactored cart and made orders API only return when necessary to keep it slim