small cleanup
Starting to make API async