Some syntax cleanup, renamed yml file