Made more stylistic changes