Cleanup and update readme