Cleanup and API stuff

hello