Other minor style changes