More streamlining + style fixes.