Cleanup of sample and included in readme2