improved yaml syntax