Minor Style tweaks