Feature/less output