Some more minor style updates