Re-arrange and rewrite to improve clarity