tidy up CLI and deploy example