added cli + cleaned