Some small stylistic and consistency changes