cleaned up stubbed api calls, consistent JSON output