Some more trading of style for clarity.