clean up and CLI