More small style fixes.