Thanks for cleaning up the yaml. In the future it would be good to make changes like this in a separate pull request, though, so that we can merge some things while others are still under code review.