CLI tools cleanup, help