Clean up main and update readme
Clean up main and update readme