Stylistic and convention changes recommended by GJ