Small style fixes and tweaks