Change yaml to yml, clean up, update variables.