Cleaned up Spot API.