Changes after applying contrib/format.sh