Un-removed comma, this isn't a "tidy code" merge