Cleaned up call to /api