make WPE section more readable and consistant