Found crazy inefficiency in API calls, got rid of it :-)
A bit of tidying up