Again, minor style changes