Cleanup and update script + README