A few quick stylistic changes