Some minor style modifications