Several minor style changes