One API call; code cleanup
One API call; code cleanup