Improved the CLI and removed the example task