Some minor style updates