Very minor style/consistency updates