Some style changes + YAML